Slight improvement to label layout code.