Boy scout rule clean-ups in Compat