Fix type db lookups for __-prefixed names and comma-typed args ##types