Minimize use of `stream` calls