It looks like I was able to fix it by changing the call

this.SetCurrentDataSet(oDS);

to

foreach(DataTable oTable in oDS.Tables)
	this.SetCurrentDataSet(oDS,oTable.TableName,false,true);

The key thing being the final parameter (RaiseEvents)