CLeanup, ready-to-merge.