Minor changes that affect whitespace in generated html.