Simplify return logic.