Remedying the Neyman-Scott phenomenon in model discrimination