Hi, I'm thinking these few patches should do the trick -- but I've only compiled them and looked at the resulting asm output, I've not actually ran them.
Joan, could you kindly test? The last (two) patches are optional fixes and should probably not go into /urgent.
