Does it work for both audit strategies (default & validity)?

The main problem would be implementing this for many-to-*, but if you have a patch for *-to-one, great!