refs #1705 : More robust form manipulation