Add support for undefined -> undef