Fix some macro invocations _inside of macro declarations._
Fix up some tests ...
Merge pull request #2 from drbawb/feature/fix-macros

Fixes for rust nightly