Mostly just mechanical removal of []. In some rare cases I've pulled the
default value up into the argument list.