More changes to avoid some rst_parser warnings.