[doctools] More type annotations