* Clean up some duplicated code in r64291