Let's try this mega-patch stuff.
Created attachment 62334 [details, diff] mega-patch
Comment on attachment 62334 [details, diff] mega-patch Patch undoes previous fixes and has a lot of svn crap.
Created attachment 62350 [details, diff] mega-patch I think it's much better now, could you try it again?
Comment on attachment 62350 [details, diff] mega-patch all rejected. patch not happy. please try again
Created attachment 62393 [details, diff] mpatch Done with use of magic methods, hope it works.
Created attachment 62408 [details, diff] mpatch Once more, without -kk this time.
Created attachment 62411 [details, diff] mpatch
Applied and removed tabs. Thanks.