Followup to previous changes in math_utils; have the code use