Catapult: Switch constants to defines