Various attributes were referred to on wrong object (because of earlier refactoring?). Fixed.
Various attributes were referred to on wrong object (because of earlier refactoring?). Fixed.

cwi-dis/iotsa,cwi-dis/iotsa,cwi-dis/iotsa,cwi-dis/iotsa