Typ-handling modified.