Don't break A/V relationships at save. Closes #228.