unify spaces/tabs.  add additional options to stream service for
overriding port/scheme.