CXX-200 Use proper undef syntax