Right.  I do check that there is no `gal` field when there is `psf.signal_to_noise`.  The latter is only allowed if the PSF is by itself.