Change defsubst to defun.

There's no real performance gain from using defsubst.