Comments from review and test changes.