This is just various things that ended up in my working tree around another set that isn't ready yet.