Fix generic types.  Should really break these up into the individual
auths, not a passle of mashed together different types.