Simplify code to make the compiler happy.

Ensure that all functions end with a return in order to make the
Go 1.0.2 compiler happy. Fortunately, the updates read just as well
or better so it isn't a loss.