Avoid format_html altogether now. A real fix for #41, not just copy&paste