Added support for 'r'.