BPP-10972 Better handling of OpcodeStack