BUSTICATED: initial work to fix symbol-at-point