Refactor rax module
Merge pull request #4919 from sivel/4577-rax-refactor

Refactor rax module. Fixes #4577