Also, while I *might* find time to look into i386, I think this should be a different merge request. This change is already beneficial on its own. Also, I will be out for two weeks soon, and will likely not be able to finish that beforehand. So having the first part in, would be a nice win, I guess.