Tidy up some alias syntax to make explicit pointer type migration easier