Indentation is inconsistent here. It looks like this is all new stuff so we might as well get consistent whitespace in it while it's easy to do so.