Remove NullValue type, which is useless.