More support for RS annotations.