Comment updates (no bug), r=rail