Address another review comment
Merge branch 'reparallelize' into parallel-floats