Rework NormalizeAttribute pass

Now that NormalizeMethods is more complete, NormalizeAttribute is
getting simpler.