Get rid of maybeAuthIdRaw #486