This commit: further refinements prior to resubmission.