I think this (698-712) is a very sensible thing to do - could I request that we mention this procedure in the config documentation Wiki?  It does mean that in the `else:` case the noise model in the output is somewhat (very, very slightly admittedly) different from that specified by the user, so we ought not to do it completely silently.