Remove hints not available in base classes, and add hints for existing functions not listed
(cherry picked from commit bdfd7ae)