BAMPFA-79: Minor reordering of rules for consistency.