Luckily I only had a chance to mess this up in one fork. And I don't need to actually make any changes because my definitions are order-independent.