More cleanups v2

Here's a new version. I've removed the erroneous commit, and added a comment about the documented switch.