Finish initial work on float/int conversions