Clean up more pieces of the Everything::HTML space