Improved smoothness of negative Expect tests
Various trivial cleanup/documentation