Clarify some TODO