Redoing the arithmetic. Should fix some erroneous behavior on complex expressions in weird contexts.