#DDC-1590: Fix Inheritance in Code-Generation

http://www.doctrine-project.org/jira/browse/DDC-1590
I'd actually avoid overwriting a variable if its meaning changes.