Resolving more symbols properly.