DONT PUSH: lame attempt at speedups
Attempts at macro fixing.
Revert "Attempts at macro fixing."

This reverts commit 4bc4072b8f814a6fb0ef38091bd15356c6896b0f.
DONT PUSH - PIT testing stuff