Rework merge resolves to keep two types of arithmetic test separate.