Reputing my comments back in after they were removed by a merge.