[MAT-420] patch up following rebase.

The replacement of the visitor with something RTTI
based requires patching to match new enum naming
caused by the changes on this branch.