Fixed xtension initialization design defect.
Some code clean-up.