Simplified generation

Since it's impossible to have matching filenames, the typeSet check is
not required.