Bugfixes to create_instr_data().