More cleanup from the plugin template.