client/listener: Some progress towards making changes.