Trying out a simplification by removing BigDecimal

Feel free to reject the pull request, I just wanted to see how it would look.  It gets rid of all the awkward underlying calls, but we may end up needing to add it back in later.