I'm skeptical about it.
Perhaps I misred some messages in this thread due being rushy, but Oda having a nerfed Killer for the final fight would prove a pretty odd twist of events and so we need to see whether or not Killer will be consistent at not laughing from now on.