More spec parsing work.