Major work to get indents right again in this file after recent merges.