1. ENHANCED: Several new CHR rules.
2. CLEANUP: Unified CHR approach a bit.