Making all number parsing invariant

Fixes #38, fixes #39