Note to other reviewers: my comment above is out of date; we decided not to include the defaults in the AD. The code above is correct.