Target platform cleanups

This gets rid of everything that was breaking up the platform name into pieces, I think. It also does some other clean ups on the way to another set of changes that I'm working on.