Improve how static fields are converted to keywords