This is a resend of the previous series (I have my send-email problems mostly sorted at this point) This has been rebased on master, and some of the commit messages updated since the last send.