Slightly decreased memory usage