More progress on the refactoring.

For example, private vars of base classes are now supported again.