concurrent: switch completely to RAII locks