They will probably mostly go away but I think at least the methods testing the log message number will stay so let's fix it while we are at it.