Handle matrix supermacros that look like normal macros.

closes #36