Hi, 2 further attempts to clean up patchbomb code a bit towards readability. The forcing of opts.get might be a bit harsh, but is my understanding of the advice ThomasAH gave me on this list. Dennis Schoen's inline/attach patch could be applied afterwards, I can propose an updated version in his name, if these go through. c