Improve the code quality of AnnotationWriter.

3 jobs for improve-annotation-writer in 6 minutes and 29 seconds (queued for 1 second)