Committed fixes for rst.el from Felix comments