Alter typehints refs #1183