It seems like the build failures on master were rooted in this problem; at least, they've gone away here.