Replaced list-object with pair-object; added nil-object.