Also, while we are at it, this should use private static, as per the new config system requirements :-)