Nit: missing ", optional" (and again below).