Indentation: Also indent when a line ends with '->', and some fixes