That makes a lot of sense. I can't think of anything that would break in the current story. On the other hand, I'm a little loath to make a generalized fix right now just because we've already DoD'ed the story and I'm leery of introducing any risk near the end of the sprint in such a complex feature. 

Why don't we merge this as-is and consider that generalization for later. I'd like to get @dangoor's take too.