Use a set for subtypes.

This prevents us from adding the same subtype multiple times.
2 files changed