Attempt to always resolve annotations
More comments