CR #97 cleanups
Recovered non autogenerable parts of former co.h.