wip to remove casts on math calls