Ditch ngStorage for our own more robust version

Which is also much shorter.  Also trim unused and redundant parts of
fold in the process.