Incorrect macro-expansion of evilified-state-evilify-maps with pre-bindings

[bcc32]

evilified-state-evilify-maps attempts to modify MAP during
macro-expansion rather than expanding to a form that does so. This
means that if macro-expansion occurs before MAP is bound (to a
keymap), it errors unexpectedly (even if :eval-after-load argument
is used or the whole form is wrapped in with-eval-after-load).

To demonstrate the bug, evaluating this snippet succeeds (and
returns nil):

(when nil
  (evilified-state-evilify-map bogus-map
    :eval-after-load bogus
    :bindings "a" nil))

whereas evaluating this snippet errors:

(when nil
  (evilified-state-evilify-map bogus-map
    :eval-after-load bogus
    :pre-bindings "a" nil))

and indeed, this errors too:

(macroexpand-1
 '(evilified-state-evilify-map bogus-map
    :eval-after-load bogus
    :pre-bindings "a" nil))

The latter two error with:

Debugger entered--Lisp error: (void-variable bogus-map)