Use maps instead of lists for type arguments, see #156
classname doesn't include type arguments anymore