Improve type inference for public method return types

Improve type inference for public method return types #612