ERC broken since Oct 15

[Jim Meyering]

If I start emacs -Q (built from bzr) and run M-x erc, etc.
I get this:

For information about GNU Emacs and the GNU system, type C-h C-a.
Making completion list...
Connecting to irc.freenode.net:6667... ...done
Logging in as 'meyering'...
erc-server-send: Invalid function: erc-with-server-buffer
error in process filter: erc-call-hooks: Invalid function: 
erc-with-server-buffer
error in process filter: Invalid function: erc-with-server-buffer
error in process filter: erc-call-hooks: Invalid function: 
erc-with-server-buffer
error in process filter: Invalid function: erc-with-server-buffer
error in process filter: erc-call-hooks: Invalid function: 
erc-with-server-buffer
error in process filter: Invalid function: erc-with-server-buffer

If I revert this change, it works once again:

2012-10-15  Stefan Monnier  <address@hidden>

       * erc.el (erc-log): Make it into a defsubst.
       (erc-with-server-buffer, define-erc-module, erc-with-buffer)
       (erc-with-all-buffers-of-server): Use `declare'.
       * erc-backend.el (erc-log): Adjust autoload accordingly.