Fix the handling of doubles/longs.