We can git rid of references to Numeric, I think