No ticket: minor 1.x/2.x code standardization