Some more `alias/3` to `alias/2` changes to avoid deprecated warnings