Slight change -- after much failure trying to pass type names around
Refactor, reformat, move on