Create branch for HTML cleanup (see #3) and CGI normalization/cleanup (see #15). Changes for one will affect the other; better to handle them in the same workflow.