refs #738 Simplify the structure of the main update loop