Also, this is unrelated to what the rest of this diff is about, right? (or is `defaultValue` resulting in warnings? I vaguely remember you saying that but I can't find it)