Changed to static by check-in [114024ffe7], with tests.