Improvement on FeatureMapping on Statement because of change behaviour of typechef in generating the ast