[#3028] Dry out code a bit.