Yes, that's exactly what should be done.

(Not to be more general, though. To be more robust (less error-prone), more self-documenting, etc, etc.)