More MaybeWeakMultiset changes.