Simplify and consolidate return types.