Get rid of most macro deprecation warnings.
Merge pull request #312 from tixxit/fix/macro-dep-warnings

Get rid of most macro deprecation warnings.