Minor fixes to sws2rst for processing a few more tags