Created attachment 102960 [details] [review] Fixups for Christian's patch This patch on top of Christian's patch has been working very well for me.