Another dump of too much editing to lose in new instr encoding