Fix inconsistent return statements

This pull request fixes some inconsistent return statements where the docblock does not correspond with the code.