Add support for negative numbers and expressions.