Merge "Remove unused #defines from "arith.h"."