...
Also, based on the ISDA definitions, our definition of 'commodity' may be too narrow - need to review that with respect to the annex at the link given, above.
Total return swap, excess return swap, and return leg should be revised to cover the definitions in the ISDA document (total return swap is currently specific to security-based swaps, which isn't right based on the definitions in this document, it's more general). The document also includes index return swap as a thing, and those can be either total return or excess return swaps. There is also a more general definition of basis swap than what we have in IR swaps in this document, so that should be moved from IR Swaps to Swaps and revised accordingly. Content currently in the return swaps ontology should be merged with the swaps ontology once we have good definitions and a better understanding of the concepts.