Feeds: Miscellanous clean-up and improvements to the feeds plugin