Clean up constant check
Merge branch 'master' into function

Conflicts:
	jkind/src/jkind/analysis/StaticAnalyzer.java