Now typing constants when needed work
Cache macros