looking again i think there probably is, and i've added a FIXME.  (i think that's good enough for now.)