Fix int/float fallback removal errors, make style closer to the rust guidelines