Uniform attribute refactoring.