Bugfixes in the defn macro