Add comments from martin@ (uncensored).
We should review some of these patches and possibly remove them.