This is a minor refactoring for readability.

Tested x86_64-linux and powerpc-aix. Committed to trunk.