Improved support for Google Analytics plugin.