Replace a couple more almtx_lock/unlock calls