Converted to use tabs for indentation and a tabsize of 4 instead of 2. Much better.