Rearrange the code to remove a compiler complaint about
the missing return from a non-void function.