Moved the tagtypes changes into a separate patch.