Personally I don't mind if the Tavern set has a large number of non-combatants. I'm hoping for at least one barkeep, a couple tavern wenches, a bard, a cook, a bouncer, a mysterious old man (to give out quests of course), a stableboy, some town watch, a pickpocket, a thug (to start brawls)...I wouldn't even be adverse to off-duty townpeoples like butchers, bakers, merchants etc.