r7094: use the Form() object in a few more places