modelFor is used constantly, the extra normalization and string splitting was causing measurable slowdown.
Merge pull request #2204 from stefanpenner/speed-up-model-for

modelFor is used constantly, the extra normalization and string splittin...