A little refactoring to use explicit returns.