Moved default Arb registration to Arb module.
Small cleanup.