Adding missing calls to typeof