Further improved the annotation extraction of the type pool.