Misc. source cleanups.

Spring cleaning!