Do these look sane to you?  I can squash them into the commit if so.