Cool. If you don't mind let's split it out into a separate diff though, I don't want to confuse it with the ARM64 stuff.