Switched to non-indexed annotation reader

This allowes multiple constants of the same type at one place.