Style markup headings the same as constants.
Style tag names and attributes differently.
Remove unused keys/values.
Merge branch 'variant'