Fix some syntax quirks preventing the use of gnu-indent