Work in progress. Improve insertion of labels during make code or data.