git-svn: remove ad-hoc canonicalizations