agreed w/ Sarina.  unless @cpennington says otherwise, I think maybe leave this TODO in the code (in case there's a future improvement in mind?), but let's not change the actual functionality in this PR for simplicity's sake