Nutting out the Korma 'where' macro

kormacore.clj

;; The original macro
(defmacro where
  [query form]
    `(let [q# ~query]
       (where* q#
         (bind-query q#
                     (eng/pred-map
                       ~(eng/parse-where `~form))))))

;; The macro with unaliasing support added
(defmacro where-1
  [query form]
    `(let [q# ~query]
       (where* q#
               (bind-query q#
                           (eng/pred-map
                             ~(eng/parse-where ; <- I want this to be evaluated before pred-map
                               `(unalias-form '~form ~query))))))) ; <- This is evaluated properly