Looks like the indentations are very very long in this file. Is that normal? How many spaces/tabs? We should pick something reasonable and fix (do it in a separate PR, so it doesn't get mixed with this one.)