Revert "Making macro arguments safer"

This reverts commit 820e05f6851e2979cf4d5c4b3dede56d428ad866.