Supress error after Xcode 7 update: error: null passed to a callee that requires a non-null argument

comment out LL_DEBUGS that fails because 'expression evalauted desipite being used as an operand to typeid'

Some improvements: renaming to act like "legacy matching" would apply only to the models simple enough for this