Remove barely used workaround code
Make scindent more robust
Indent