Address code review comments.
Allow reduntant returns of multiple values.