More refinements and a small simplification.