More git-ificatoin, cleanup.