Some work on our plugin architecture [ci skip].