Bug in previous merge. Scheme names appeared twice.