SVN revision: 16392
rationalise pointer usage down to 1 for init, 1 for everything else. SVN revision: 16304