Change defsubst -> defun.

There's no real speed gain from using defsubst, and it interferes with
debugging and profiling.