Do less unnecessary work!

Also less nesting!