Prepare for merge back into ropgadget.