Do not merge subtype more than once. Several minor fixes.