Bug 14591: Update other calls to AddReturn