Addressed all comments except parsing regen and refactor of watch sockets in IfaceMgr. Doing those separately.