Make bloom filter code more independent