Unbreak build without own deprecated API
Using in-class member initialization to avoid the need to juggle with ":" and "," in the macro branches
Using in-class member initialization to avoid the need to juggle with ":" and "," in the macro branches