(Ah, this may be handled below -- if so, ignore the above comment.)