Add better handling for completion inside identifiers