Minor, inline only once-used methods
Buildserver auto merge