Fix 'return' statements