These are INDENTATION CHANGES ONLY, with the minor inclusion of removal of
'final' keyword where it's not needed, to make the original lines fit with new
indentation. I don't like mixing functionality changes with style changes.
There are no functionality changes here, except the removal of 'final' which
has no effect. Unfortunately the diffs didn't turn out so obvious.
