Trying to make findbugs matching better