Better fix for #187: Fix some false positives when looking for symbols