More progress on Re #443 while testing how git works.