Fix macro expansions

This is a fix for the latest rustup: `rustc 0.13.0-nightly (99d6956c3 2014-12-18 20:32:07 +0000)`
The fix mostly involves following certain macro invocations with a trailing semicolon.

_Note about the last commit_: The file `tests/matches.rs` claims it is machine generated by a script in `src/etc/regex-match-tests` but I could not find this script in tree.

I went ahead and edited the file anyways since this is a very mechanical transformation; but I can strip that commit out if its an issue.