Get ready for grep-stream capture support