Removed simplifiations of trivial components.
Merge branch 'master' into optimization

Conflicts:
	src/input/GringoNumericFormat.cpp