[Issue #364] Better handling of indentation after kill