aco: be more careful combining additions that could wrap into loads/stores