Requests from Dan's code review: