Some more S22 tweaks, introducing .parse-spec