#KJ-80 6. Cleanup the dependencies between the two semantics. Cleaned up the configuration of the preprocessing semantics.