Change SUB_STATE_RETURN into a typedef