Complex TOC has been tested with RDF1.1 (that uses it big time). This branch is ready to be merged back into the main branch…