Uh, I guess I was still using html_line_break in a few places.