More cleanups to the extend.rx