A streamlined version of my PSFFormFiller