Annotation improvements, mostly for form-list and form-single
Formatting changes only