Further rule consolidation