Hi,

some parts of the former patch have been reimplemented in the meantime by
other patches so this is only a part of the former cleanup.


Jan