Merge "Make BagOStuff::incr abstract to discourage bad implementations"