This reverts commit feb68037. This was a bad idea, the macro is actually a bit harder to convert to a static for the other use cases