Use dimensions more consistently.