More minor changes.
Merge branch 'master' of https://github.com/frenetic-lang/frenetic