Revert make_pair change, Didn't mean to submit that for PR; Also included a pair of parenthesis forgotten when checking for invalid class in transmog