More thiefp disassembly