Added return to some places for consistency.