Changes per @jspahrsummers review

Squash before merging into master