Makefile cleanup
Making InferenceAnnotationScheme inherit a derived type of SimpleAnnotationScheme and
fixing a bug where function-pointers would crash the semantic checker.