whitespace
Upgrade final bit of deprecated flags logic; fix build