Improve handling of full-gc.