Streams 159

Pull request open on apache too.
My only concern is that if that one statement changes, it'll have to be made in 4 places.  If it's not readable when OR'ing together the conditions, then I guess it's fine as-is.