failed merge...fixed; minor tweaks to newly introduced is_defined/is_true