Refactor checks for valid overloads