Improved preliminary label support.