Added return to some places for consistency.

Related to #2168 
Yeah I thought that looked weird. Removed.