Cleanup loose-ends from previous submission (Dec 18).