This flips the AMP instance definitions into canonical form and makes the code a bit more future proof.