fix handling constants that were already resolved by annotations