The main `use-package' macro incorrectly planted code containing a call to the `with-elapsed-timer' macro in a quoted block to be run by `eval-after-load'. If package use-package was not loaded at runtime, the block would error saying correctly that `with-elapsed-timer' is undefined. This mod correctly macroexpands the block at code generation time.
`diminish' accepts an optional second argument, a replacement string. This change supports all the following arguments to ':diminish':
* package
* (package . "pkg")
* (package1 package2)
* ((package1 . "p1") (package2 . "p2))
The second and fourth formats are new with this change.
