Last change accidentally disallowed mismatching 'nogil' assignments even when compatible. Reallow them, and clean up the last change a little.