Fix XMPP Parser for latest parser changes.
Merge pull request #209 from greboid/tidying2

Fix XMPP parser for latest parser changes.