Use through2 shorthand callback

All tests pass.