Copy match cases correctly. Closes #592
Prepare for array switcheroo (those weren't ooc arrays anyway)