Improve code layout slightly.