Progress with the WP Present Component -checkpoint. Rewrites are mostly happy