cleanup builtin.arithmetic