A little rearranging to make OCLint happier.