Various code review markups ready for merging.