Minor refactor of RAA args