Move subscription into waitOn.