Change lookups to be more bucket-aware, necessairy for actually getting any improvement from the longer bucket prefixes.