Completed internal changes to support metaphor switch for Hose to Pipe.