More cachegrind tuning, plus fix an error message.