Clean up more specs

This gets interpreted mode spec failures down to 11 on my machine, from 51.