Thanks for your great answer. One more question: how do I include cgi-bin/Apache/BML.pm into my patch? It's neither in dw-free nor dw-nonfree.

Also, I'm unsure about forms like these:

$body .= "<form method='get' id='userpic_authas' action='editpics$suffix'>\n";