Clean up in prep for pull-request back to @inez