Replace existing XmppStream properties structure with OptionHash

- Minor additional cleanup