Switched the checks to much saner switch statements