Cleaning up after @jchannon again :-)