Fix returning traits in trait calls, move towards clone on return