-Codechange: use FLAG_UNIT_NNN where possible