Refactoring.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21145 a95241bf-73f2-0310-859d-f6bbb57e9c96