Some minor refinements.