Cleanup decoder to use NoNerror.