Merge "Hygiene: use null-coalescing operator when operating on tags"