Fix auto-completions for method calls
Fix regex for variables