There is a test for #if STANDALONE in spinlock.c. In all other places the test is if the macro STANDALONE is defined.
Checked in a fix just now.
sorry for the same, cleaning up the database to prevent unecessary reopens of bugs.