Dropped ArrayShouldWrapper and JavaCollectionShouldWrapper and their implicit conversions!
In the process I elided a few more contain A/AnMatcher things, which I had missed before.