Switch to using h-tags everywhere.