Updated to support changes in rax.