Merge pull request #165 from dreid/proper-returns

Don't try to fit the type into the :return: declaration.