Jc 2032 code review refactoring

http://jira.jtalks.org/browse/JC-2032
Is there a purpose to set `not-null=false`? It's the default, right?