Fixed varius issues pertaining to forward_declared/pre_analyzed