removed storing of xaddrs separately because now the same information is available directly from the semantic tree