Minor cleaning up to our plugin interface.