Eliminate use of the IllegalArgumentCodec