Clean up some unnecessary switch statements