Various spec improvements.