First round of changes for the 'make new plugin resolution mechanism public' story