Fix improper merge of make-it-pretty branch.