Just some more minor clean-up of the source files.