Improved provenance

This improves the static debug information in the generated file.