Fixes #4200, revised rest of @api classes/methods, closing ticket.