Minor cleanups to spinlock code