Improve the code quality of Context.

3 jobs for improve-context in 6 minutes and 37 seconds (queued for 1 second)