Replace @s with Rc types.(fixes #2079)