performance tuning

Removed a few folds during the schema parsing. Should make things faster. Certainly reduced O() complexity of the op.

Also made an easy hook to add smart merges in the future.