More cleanup in formGoodies.