Group into fewer states to speed up handling