Updating: properly handling listnil-like constructors.