Include unit numbers in <w>-tagged files