Actually I don't know that anything that you patched against has really changed that much, so it will probably apply pretty cleanly ... My concern isn't a comment on your code as much as it is just a large patch (by nature), and I have been too lazy to go through and review it all to see if there are any wacky side effects on the RMML side (which you don't have source to, so couldn't anticipate). Hope you haven't taken offense to me dissing you patch for a while now