Refactor, consolidate returns.

Two successive conditions both return false on failure, so I combined
them with logical or (||).
Remove unnecessary else.