More appropriate HTML comment handling