Reflecting changes in RSG support annotations and a few other things.