Remove some pointless return code values.
Merge.
Simplify code.