Fix macros introduced in 79a30e62ad50d298e07a9919a2357ea842a32e18

The macros introduced in pull request #31 don't compile. These do.