Remove NO_VALUE from undefined