Minor refactor
Remove boatanchors
Do "remove and sort" on all the usings.

Yes, I'm a little jealous I can't do this for C++.