Jc 2032 code review refactoring

http://jira.jtalks.org/browse/JC-2032
Do you think we really need this constraint? In what cases would it be useful?