Fix up code for loading basic block traces, also fix bug in instrumenting landing pads