Good call to address this given/when issue. Have updated my original post to reflect this...