Trying out a simplification by removing BigDecimal.  Feel free to reject
the pull request, I just wanted to see how it would look.