improve assertions for case auto-selection