Various refinements.