Heh, yeah the whole file deserves indentitation love. Let me do that in a separate commit once you are all happy with the patch. Do not forget to remind me before merging :-)