Out of time. I have to punt on this for now. I created a tech-debt ticket for it: NSM-225.