untabify, fix scoped_ptr
really untabify this time