Clean up the return type.