spun most of the macro insanity out into pymare (github.com/zardus/pymare), made enum lookups a lot faster