Comment 15 for bug 610525

I think 3) is OK for now.
The warnings are acceptable for me.