Better handling of conflicting types between DebugInfo and platform types

[plafosse]

When DebugInfo types conflict with Platform types they're prefixed with an _1 This isn't great. We should be checking for equality and replacing ones that are exact matches.