Refactor so that compiled traces can be correctly used with LARJ.