Removed all the extra helper macros for 1.1, and adjusted the test suite accordingly.