Move some data and functions from the class to module level. Patch by Cheryl Sabella.
(cherry picked from commit 998f4966)