got rid of some "enumeration values not handled in switch" warnings.