Yeah, it's a change from the previous algorithm, in order to stop "as early as possible". Authors should just put the default value last (and we should require them to do so, but I'll fix that separately).

Good catch about whitespace here, thanks.