Use Lambda<type> for all tagging
Remove redundant adjacent color changes