A few additional changes should be made to the API specs for these classes that were missed as part of JEP 486.