More cleanup around handling numbers.