More numeric conversion cleanup.