I guess I can bring some of the changes from #348 and avoid these `html` calls after all.