Fix a couple of deprecation warnings.

The macro APIs are continuing to undergo changes. I can't fix all of the
2.11 warnings without forking the code, requiring experimental compiler
flags from all 2.10 *users* of the library, or dropping 2.10 support
altogether. When 2.12 is released, I'll probably drop 2.10 support (or
require that experimental flag).