Created attachment 286333 [details, diff]
Unworking patch
Well this is mostly search'n'replace patch which, to no suprise, doesn't even compile. Attaching anyway if someone else wants to take a stab at it, and finds this useful