Clean up handling of function return type annotation.
Merge pull request #267 from pfalcon/func-ret-ann

Clean up handling of function return type annotation.