More efficiency improvements

More efforts to avoid allocation where no updates happen.