Attempting again to fix Travis build. Looks like some generic types and
streams operations are at odds.