NOTICE: this is not a stable branch

Forced commit to note that this branch is draft construction and
may be destructively rebased without notice.

Buyer beware...