Add comments explaining the new discard_changes calls