Improved return types