Shrink and regularize by converting to macros
Shrink tests slightly
Shrink and regularize by converting to macros
Version 0.1.1: Slightly more regular