[Subversion 1.7] Fixed up all the types (I think).