Merge "Add some casts for sanity before BagOStuff::add() calls"