Also, fix (roll) which wasn't properly implemented.
It isn't used by low level boot code anymore, so it can go there.