@MartinEscardo I realised some months ago that some of the proofs/constructions in my thesis were cheating; it has taken the development of new ideas to overcome this and produce more honest proofs.
The former constructions misused and abused setoids; the latter constructions should work for QIRTs. At least that is my hope as I am no expert in them.