ExpandURL: Cleaned up the plugin.