Add additional PHI node features and direct call/switch statments in Feature Extractor.