Thanks for the clarification.  Worth a TODO here?  Which user story have we deferred this work too?