Fix values of <afile> and <amatch> for NCmdUndefined