Reorder warnings

This is based off of EvenMoreWarnings. Getting close on OSX, only 5 warnings left.