Adopt usual singleton idiom

@andymoe, colleague pointed out this ugliness today... and could not let it stand! :-)  

Looking forward to us getting time post-release to do The Great Purge of cruft like this.

Happy for you to merge on +1.