Another simplification pass