A bit of a cleanup of parse_uid.