Moved default_zero into ann header, where it belongs. Commented out token position debug.