You're right, that's exactly the case. The latter is simpler, so I'll go with that.