RAA: clean up the RAA infrastructure, make it support larger indicies