Implement rax2 -D and rax2 -E

Plus some re-ordering.