Clean up + test add/sub/negate, fixing a debug assert in negate