Merge "Refactor RA parsing code for simplicity."