Slight refinements.