cleanups around PHP bug 52211