Also did some storage server implementation cleanup, removing some
dups and folding a small module into StorageServer.py.