Drive-by: if this TODO is marking a problem you think is in the existing code, please file a bug so we don't lose track of it.