Demo theme files should have already comment_form plugin support; some minor code cleanup.