Now that we do the space expansion, some of those get properly separated from the name and can thus be cleanly removed here.