Disable 4.6 again, I'll move to g++-4.8
Fix ',' in match descriptions.

Fix bundle, which must restart the last match. In pre impl., we peek
in match.