Tighten up conditional returns a bit.