Refactoring ShumwayStreamConverter (see bug 924571)