d2-common: squash upstream things