Clean up some deprecated port types and refactor some of the plugins with
relatively few control ports.