Merge "Made default BagOStuff functions work consistently."