Issue #168 and associated commentary, centralize and enhance model normalization, also fix for #142

Just janitorial work, should work exactly as before.