Added shortcuts. Re #6212.