Yet further fixes precedence issues