(#5079) Move methods around to make it clearer whether they're public or private

One method was showing up as a private class method, which turns out
isn't possible, so it got moved into the public section.

This is a rework for diff clarity of a patch submitted by
Sandor Szuecs <sandor.szuecs@fu-berlin.de>

Reviewed-by: Paul Berry <paul@puppetlabs.com>