Use expect syntax more consistently