Util.pump cleanups

Change-Id: I688d077ccf417279ccb47d9cebd25a531eb881b3