Cleanup handling of some constructs
Bootstrap, full testsuite is passing
Handle nested TRMC and debug events