Small 4.4 edits, but more to come re: idempotence
Merge branch 'jfp' of github.com:lkuper/dissertation into jfp