Improve num/numf definitions