Some work on simplifying our plugin interfaces (#341).