Added return to some places for consistency.
Doc update.
Merge pull request #2169 from arb/return-reply

Added return to some places for consistency.