Removing a deadlock, removing unneeded pointer dereferences.