Agree. I didn't find a clean way to abstract this, but am open to ideas.