Fix more 'undeclared identifier' errors.
Revert changes to koch.