I propose to refactor method name dispatching to switch statements to follow #25163. Thank you :)

Comment From: sbrannen

This has been merged into master.

Thanks