I think this is mostly just test support, but I need to review the 3.1 spec for new features that might need special handling in the rules.