Improve program flow.

go vet .
util.go:80: unreachable code
Ops, I take it back ;)  Maybe just remove the return at the end to make vet happy, but ...