Good idea. I'm doing it only for the new specs in this pull request. I may open another to fix this in all specs.