Remove bad prints and handle a case where kwargs already contained the name.