Cleanup Key and Encoder to use NoNError.