Yet more singleton implementation improvements.