EXT-262: Use ofp_instruction_header in the right places.