More cleanup

It's late, and I'm finding more things that I overlooked.