Neither of those JAs count as separate JAs. Our JAs are:

Trance
Sambas
Waltzes
Jigs
Steps
Flourishes I
Flourishes II
Saber Dance
Fan Dance
No Foot Rise
Presto
Flourishes III

So there are 12. We are already at the JA limit, which is why we can't have split waltzes or any JAs outside of the categories that already exist.