Fix Francisco's code review comments.