[Fix #593] Fix error with no symbol at point

Shifts the `or` back inside `substring-no-properties` to guarantee that nil is never passed as an argument. Prevents `eldoc error: (stringp, nil)` from popping up.