Fixed macros with missing semicolons

Updated to latest nightly where macros are now expressions.