More work on tags.