Fix more int/float fallback removal errors