taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") writes:

> Updated patches below.

Apologies; the latter patch was untested and (of course) contained silly
bugs.