Fix various no-*s.