Simplify DISQUS' generated code.
Merge branch 'further-improvements'