Move away from std::num