Finish rewriting RA for JRE8