Another performance improvement.