Little cleanup and made lazy init 'tags'.