Prevents erroneously relying on stale parameters from M.params (thanks to Tom Holden); closes #1627 (manually cherry picked from commit c16c2fb8)