More work on merging black and white lists.