Finishing up if_else conversions

Now to run some more timing tests and see if I missed a spot.