Add more returns.

Add more conditionals.