Remove unnecessary null check / less Thread.currentThread() calls