PIM-1555 Homogeneous code and label length (thanks @filipsalpe)