No need to take a parameter for which NULL is always passed, and related
simplifications.

Change-Id: I89bab2904fdae3520987d0f67e55b2649bf225d3