Revert "Cleanup some numeric code."