Very slightly tweak macros to work with JuMPeR