Couple more tweaks, remove a paint in st-polygon that may be contributing to
artifacts.