Issue #168 and associated commentary, centralize and enhance model normalization

Just janitorial work, should work exactly as before.