These are changes from ccde0df that will not be merged; it's a hedge that @washort is fixing in another commit.