That's related to what I tried initially but more manual. I'm in favor of doing a clean break. The doc-strings are one reason but happy to discuss more.