Include geometry fields
Update comment wording using "replacing (blank)"

...instead of "assigning new", bringing it into line with the C edit
comments convention