Lots of updates related to the <common/> tag.