Annotate return values a bit more correctly