tools: Improve diffability/maintainability