Make .stdout/.stderr suppliers more generic