Progress on CoverPoint, avoiding using assignable properties.
Further CoverPoint work.
Minor tidying.