This patch is just a little refactoring of the WWW plugin, especially to remove a couple of deprecations