Set a couple pulse callbacks to NULL during reset, and minor cleanups