Put static methods at the end. Also add a couple of missing parameter name comments. PiperOrigin-RevId: 311077684
