Moved the beautifier discussion to #3106.