Clean up handling of function return type annotation.