cleanup patch:
	make sure use of class_token is correct
	revert changes to znode typedef, reuse op.ptr