Yes, you would have to use `remainingOrDefault` if you wanted the same behaviour as `remaining` has now.