Fix some polygon-gamma vs polygon-pattern-gamma mixups. Refs #1043. More to fix.