Improved support for part markers in the geometry stream.  Now avoiding
rare case where client wouldn't know the correct behavior.

Change-Id: Ibcf7054197744628bed87fc44eea56b75649a4d7