Cleanup some incorrect return annotations