applied changes to RFBucketMatcher from Kevin in kli's commit 0fee923bc4d90547f16fe51e11ee0090b2b93cc9
NOT SURE whether this is doing the right thing -- convergence issues
with the RFBucketMatcher (see GeneratorTest)