Less ugly code.

[skip ci]