Follow up from azakai's code review