Further simplify logic in functions for aperture photometry