Refactor to enable #835 to occur outside of Mvx