Swift: cleanup use of explicit enums