Fold singletons into case statement