Changes to address comments from https://github.com/PixarAnimationStudios/OpenSubdiv/pull/310.