Cleared our some old debugging cruft
Whitespace fixups
Improved extended symbol warnings