Refactoring in the way the parse function is invoked.

--HG--
branch : trunk
2 files changed