Improved Simulator memory and performance.