Switch to using clcommon.number module.