Further RA project cleanup

This is just another migration/cleanup PR, depending on #7161.