Fixed punctuation macros

Punctuation macros were way too nested (original reasoning was
incorrect)