More changes to recursive spinlock code