I agree in abstracting this and isolating it - esp. the awareness of a legacy path like stories <--> pieces.
Also understand why this is a todo rather than implemented in this PR. Thanks for explaining.