Final push as I'm shelving the plugin.