Move a few things around to unblock autoimport of Rx namespace