Couple of cleanups to num.rs

Couple of cleanups to num.rs #3752