[#1879] A bit of code cleanup