This cleans up the code a bit and will let us get rid of it easily when the time comes. SVN revision: 83510