Frank Terbeck <ft@bewatermyfriend.org>:
[...]
> Note, that I am still troubled about the use of 'type' instead of
> 'which'. Could someone enlighten me about this?
[...]

Okay, here we go for this one.
See appended diff.

Regards, Frank