Improved the handling of numeric default values