Make builtins and keywords more subtle