Some general cleanup.

Make the collection proxy configuration a little more readable, and some minor style cleanups.