Calculator: expand number availability.

This adds the ability for numbers to contian spaces or underscores.  It
also makes me recognize once more how brittle all of these
inter-relationships are.