simpler maintainance and get-orig-source rules