Got rid of SYSTEM_LOCK macros.