I swear I merged, compiled, and did `make check` and everything passed.  Whatever broke was recent.  OK, rebasing and retrying.