Use a better return type for Annotate.