Progress on re #443 while testing how git works.