Fix simple-type set to include null and undefined