Some improvements in float/integer handling.