Updated/New Composer support for HTML_Safe

See diff for full changes