base has become a crazy catch-all, and it imposes weird deps that ripple out everywhere.