TODO: Updated following the addition of ;auth=<MECH> support