Minor cleanup in ncch.