WIP: speed up selector identifier lookup