Good point, and you can never be certain how the substitute forms will be embellished especially if they're altered dominants.

Best Regards

Alan