More minor changes based on code review of commit #8526bca