(RARCH_CONSOLE) Refactor more state variables