Bring the code in line with memtrail.