More form changes
Merge branch 'master' of https://github.com/gcs278/polysimplicity