KNF and other cleanup.