Remove inversion-of-control style "stream rest handlers"

Use the new *plexing style which is more straight forward and less magic