Jc 2032 code review refactoring

http://jira.jtalks.org/browse/JC-2032
`attributes`. Doesn't your IntelliJ give you a heads-up on the wrong name?