Tweaking format understood by parse_spec to remove some ambiguities wrt omitted components.