Prefer 'not' to 'xor' where we mean 'not'; slightly fix comments.