Don't use an upstream parameter

 except where it can be used to help performance.
And then, only use it sparingly
Begin cleaning up protocol

Spout:
Vanilla: 

Signed-off-by: Jack Huey kitskub@gmail.com