Switch const static to static const declarations