Remove null defaults, they cause more problems.