A pair of tiny cleanups in the federation request code.