Subobject clean-up work in constructor

Follow-up from some other changes which always was a thorn in my side
therefore doing this change now to make this interface a bit
more "compos mentis"

Code coverage: 100%
CRAP: 15 (down from 17)

Change-Id: Icc1c7287fec8c3022fe016e985f748eef4dfd7ed
Merge "Subobject clean-up work in constructor"