Some work on realignment of the plugins spec after recent intention changes.