OSX: More nametool improvements for Qt5
Small code cleanup for Bob's changes