add_cr() is not used anymore, and HTML entity handling got UTFized some time ago already, so no need for that FIXME comment.