#29: Improved simplification