Correct and simplify precedence handling

Rules which should have been SAME were being RESET.