Fix some API breakage affecting add/remove class members