Fix solitary returns.