Most of the ones still remaining outside are special cases. Also, removed locking from status manipulation functions as it has not been required for quite some time.