minor TODO tweaking for 487.