Fix macros for rust nightly

This implements some necessary changes to compile on the latest nightly.
`rustc 0.13.0-nightly (99d6956c3 2014-12-18 20:32:07 +0000)`

The macro invocation / declaration syntax has changed to require semicolons in certain places.