Simplify some auth code, add a FIXME