Simplify roster handling code

Merge result handling code into IqParser