Tidy up for release

Please land this before cutting the next release, @bturner-r7. Thanks!