Style fixes for untouched.