Simplify return value handling a bit.