cleanup ChainStateBuilder dependencies a bit