Additional git-foo for #21