Drop suffixes, now that we are putting them in correct types