convert matchers to use the pattern AFoo.with().someProp(..)[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[Dch[2~aining pattern AFo.with(),someProp(..) so it's consistent. Cleanups associated with this