Two stage singleton construction fix - do not init if already initialized.
Code reduction and simplification.