fixing some whitespaces into tabs while at it. ok sthen@ and jasper@
(likewise, I had this mostly ready, though I don't use it)