consider resolved aliases in more places