Fix macros for rust nightly

Macros now need to be enclosed in blocks or followed by semicolons in certain circumstances.
This should be all the necessary fixes to continue compiling on: `rustc 0.13.0-nightly (99d6956c3 2014-12-18 20:32:07 +0000)`