Move more stuff to rarch_main_command