move PS{plusText,notExpandable} to the client struct