Bugfix: last commit broke --debug (created an infinite loop really!)
New class for OO-refactoring: MigrationHelper