Some cleanups

That confusion hopefully makes those think a bit longer, thus hopefully making less errors. Seems like a feature to me.