Tag library refactoring.