Small final enhancement.