WP-656 Clean up cruft toward consistency with pub branches, in preparation for saved search functionality