Follow up to r1022433: reorganize code to unbreak the build.
Follow up to r1022433: reorganize code to unbreak the build.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion