Misc improvements related to traceability.