MSVC doesn't like some of the initializer list uses in 0e940d55. Switch to named arguments to work around this.