Task #0111: Preparing for switching over to bucket match lists.