fixed NPE due to aome hashCode/equals instability (not yet fixed).
removed .code() and .eval() at some places