More clean-up of the D* connection code.