Removing all dependecies on Ed. maybe-deref for truth tests