Refactor to avoid needless passing of filenames, and make clear what is a method and what is a function.
Refactor to avoid needless passing of filenames, and make clear what is a
method and what is a function.


git-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@7007 d31e2699-5ff4-0310-a27c-f18f2fbe73fe

ashgti/parrot,ashgti/parrot,ashgti/parrot,ashgti/parrot,ashgti/parrot,ashgti/parrot,ashgti/parrot