Changes to is_defined are redundant.