Continue minor refactorings regarding 'tag'