Attempt to get things working with Keystone...

...and yet not break RAX.