Some minor cleaning up [ci skip].
Some work on simplifying our plugin interfaces (#341).