Continuing x86_64 rewrite