This addresses most of the items in issue #478. The remaining items may require longer-term efforts to fix, so we may want to merge this PR even if it doesn't fully close issue #478.
Checklist
[X] Commit sequence broadly makes sense and commits have useful messages
Description
This addresses most of the items in issue #478. The remaining items may require longer-term efforts to fix, so we may want to merge this PR even if it doesn't fully close issue #478.
Checklist