Fix PR1645 by resolving forward alias references.