remove some (AFAIK) unnecessary instances of =>