Findbugs optimizations
Fix VariableDescriptorTest.java