I see now why you moved it out, to be more DRY. However, I think calculating the full disk path twice will not be an issue.

OR, this step can add to the state the full disk path. I would be okay with that.