Use unless isearch-mode
Use
Fix activation logic
Add Swift types
Some more Swift