Isn't it possible to also follow the same approach for the annotation lookup that is used during bootstrapping?