Simplify some code in dimension.

Make things fit in 80 columns.