Language improvements to CLIENTSPEC