There are 40+ warnings and they're not really breaking
anything JUST now, so I'd rather just get moving on with
fixing the really breaking things. Once we get a little
further in the upgrade, these will break too ...

Also shorten those marker notes.

This file can house more configurations in one.