Get rid of DSA support in noderefs; NEEDS TESTING
remove superfluous casts (compiler warnings)