Added hashkey to non-unit clause.
Delete some constants.
foo
foo